* xfaces.c (check_lface_attrs, realize_default_face): Add

LFACE_DISTANT_FOREGROUND_INDEX.

diff --git a/src/ChangeLog b/src/ChangeLog
index 304f9e59ab5ad3fbb7c27506d7f98c52464fd33d..8d57357b3755bf563d51814aa3ebbef24fcae4fc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xfaces.c (check_lface_attrs, realize_default_face): Add
+       LFACE_DISTANT_FOREGROUND_INDEX (Bug#15788).
+
 2013-11-02  Paul Eggert  <eggert@cs.ucla.edu>
 
        * emacs.c (original_pwd): Remove global var by making it local.

diff --git a/src/xfaces.c b/src/xfaces.c
index 72b62216abdcfd7073bb25ffd12e756ce987a1e3..717690a42e5433ae6eeb26be09423ec4a7fc1490 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1805,6 +1805,9 @@ check_lface_attrs (Lisp_Object attrs[LFACE_VECTOR_SIZE])
   eassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX])
           || IGNORE_DEFFACE_P (attrs[LFACE_FOREGROUND_INDEX])
           || STRINGP (attrs[LFACE_FOREGROUND_INDEX]));
+  eassert (UNSPECIFIEDP (attrs[LFACE_DISTANT_FOREGROUND_INDEX])
+          || IGNORE_DEFFACE_P (attrs[LFACE_DISTANT_FOREGROUND_INDEX])
+          || STRINGP (attrs[LFACE_DISTANT_FOREGROUND_INDEX]));
   eassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX])
           || IGNORE_DEFFACE_P (attrs[LFACE_BACKGROUND_INDEX])
           || STRINGP (attrs[LFACE_BACKGROUND_INDEX]));
@@ -5352,6 +5355,9 @@ realize_default_face (struct frame *f)
        emacs_abort ();
     }
 
+  if (UNSPECIFIEDP (LFACE_DISTANT_FOREGROUND (lface)))
+    ASET (lface, LFACE_DISTANT_FOREGROUND_INDEX, Qnil);
+
   if (UNSPECIFIEDP (LFACE_BACKGROUND (lface)))
     {
       /* This function is called so early that colors are not yet